Skip to content

Fix name() functions for local defs in rustc_public #149401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix name() functions for local defs in rustc_public #149401

wants to merge 2 commits into from
+129 −117

Conversation

@celinval
Copy link
Contributor

@celinval celinval commented Nov 27, 2025 •
edited
Loading

This change fixes the behavior of the name() function for CrateDef and Instance which should return absolute path of items. For local items, the crate name was missing.

This resolves: rust-lang/project-stable-mir#109

@celinval
Fix name() functions for local defs in rustc_public
8072264 
The `name()` function specifies that it returns absolute path of items,
however it wasn't including the crate name for local items.

This change fixes that.

This was reported here: rust-lang/project-stable-mir#109
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 27, 2025
@rustbot
Copy link
Collaborator

rustbot commented Nov 27, 2025

r? @scottmcm

rustbot has assigned @scottmcm.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@celinval
Copy link
Contributor Author

celinval commented Nov 27, 2025 •
edited
Loading

It looks like I need to do some debugging. It's not clear to me why this change affected these tests. I.e., why:

std::task::Poll::Ready -> Poll::Ready
std::option::Option::None -> Option::None

It seems to only affect std ADTs variants.

EDIT: Looking at the pretty print file, before this change, the types Option and Arguments did not include absolute path, but the variant std::option::Option::None did. This uses display not path.

@rustbot
Copy link
Collaborator

rustbot commented Nov 28, 2025

This PR changes rustc_public

cc @oli-obk, @celinval, @ouz-a

@oli-obk
Copy link
Contributor

oli-obk commented Nov 28, 2025

You removed with_no_trimmed_paths. If an import in a file exists that allows accessing sth via a shorter path, it gets trimmed. Std is always imported, and some types are also in the prelude. Those always get trimmed

@celinval
Copy link
Contributor Author

celinval commented Nov 28, 2025

You removed with_no_trimmed_paths. If an import in a file exists that allows accessing sth via a shorter path, it gets trimmed. Std is always imported, and some types are also in the prelude. Those always get trimmed

Thanks @oli-obk. So how should I use with_resolve_crate_name ? Do I need to use it together with with_no_trimmed_path?

@celinval
Copy link
Contributor Author

celinval commented Nov 29, 2025 •
edited
Loading

Beautiful. @oli-obk it worked like a charm. I changed the pretty printer to use trimmed_name to make it less verbose. Thanks!

@makai410
Copy link
Contributor

makai410 commented Nov 29, 2025

Seems like this PR also fixes rust-lang/project-stable-mir#41?

@celinval
Copy link
Contributor Author

celinval commented Nov 29, 2025

Seems like this PR also fixes rust-lang/project-stable-mir#41?

Good question. I haven't tried it yet

oli-obk
oli-obk reviewed Nov 29, 2025
View reviewed changes
tests/ui/rustc_public-ir-print/operands.stdout Outdated
// WARNING: This is highly experimental output it's intended for rustc_public developers only.
// If you find a bug or want to improve the output open a issue at https://github.com/rust-lang/project-stable-mir.
fn operands(_1: u8) -> () {
fn operands::operands(_1: u8) -> () {
Copy link
Contributor

@oli-obk oli-obk Nov 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's slightly odd, that the body item gets a full path but things inside the body are local. wfm, just a small oddity

Copy link
Contributor Author

@celinval celinval Nov 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed. I probably missed something. Let me check

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer
Copy link
Collaborator

rust-log-analyzer commented Nov 29, 2025

The job aarch64-gnu-llvm-20-1 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
failures:

---- [ui] tests/ui-fulldeps/rustc_public/check_def_parent.rs stdout ----

error: test did not exit with success! code=Some(101) so test would pass with `run-fail`
status: exit status: 101
command: cd "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui-fulldeps/rustc_public/check_def_parent" && RUSTC="/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc" RUST_TEST_THREADS="4" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui-fulldeps/rustc_public/check_def_parent/a"
stdout: none
--- stderr -------------------------------

thread 'rustc' (232327) panicked at /checkout/tests/ui-fulldeps/rustc_public/check_def_parent.rs:91:33:
called `Option::unwrap()` on a `None` value
stack backtrace:
   0: __rustc::rust_begin_unwind
   1: core::panicking::panic_fmt
   2: core::panicking::panic
   3: core::option::unwrap_failed
   4: <check_def_parent::main::RustcPublic<(), (), check_def_parent::main::{closure#0}> as rustc_driver_impl::Callbacks>::after_analysis
   5: <std::thread::local::LocalKey<core::cell::Cell<*const ()>>>::with::<rustc_middle::ty::context::tls::enter_context<<rustc_middle::ty::context::GlobalCtxt>::enter<rustc_interface::passes::create_and_enter_global_ctxt<core::option::Option<rustc_interface::queries::Linker>, rustc_driver_impl::run_compiler::{closure#0}::{closure#2}>::{closure#2}::{closure#0}, core::option::Option<rustc_interface::queries::Linker>>::{closure#1}, core::option::Option<rustc_interface::queries::Linker>>::{closure#0}, core::option::Option<rustc_interface::queries::Linker>>
   6: <rustc_middle::ty::context::TyCtxt>::create_global_ctxt::<core::option::Option<rustc_interface::queries::Linker>, rustc_interface::passes::create_and_enter_global_ctxt<core::option::Option<rustc_interface::queries::Linker>, rustc_driver_impl::run_compiler::{closure#0}::{closure#2}>::{closure#2}::{closure#0}>
   7: <rustc_interface::passes::create_and_enter_global_ctxt<core::option::Option<rustc_interface::queries::Linker>, rustc_driver_impl::run_compiler::{closure#0}::{closure#2}>::{closure#2} as core::ops::function::FnOnce<(&rustc_session::session::Session, rustc_middle::ty::context::CurrentGcx, alloc::sync::Arc<rustc_data_structures::jobserver::Proxy>, &std::sync::once_lock::OnceLock<rustc_middle::ty::context::GlobalCtxt>, &rustc_data_structures::sync::worker_local::WorkerLocal<rustc_middle::arena::Arena>, &rustc_data_structures::sync::worker_local::WorkerLocal<rustc_hir::Arena>, rustc_driver_impl::run_compiler::{closure#0}::{closure#2})>>::call_once::{shim:vtable#0}
   8: <alloc::boxed::Box<dyn for<'a> core::ops::function::FnOnce<(&'a rustc_session::session::Session, rustc_middle::ty::context::CurrentGcx, alloc::sync::Arc<rustc_data_structures::jobserver::Proxy>, &'a std::sync::once_lock::OnceLock<rustc_middle::ty::context::GlobalCtxt<'a>>, &'a rustc_data_structures::sync::worker_local::WorkerLocal<rustc_middle::arena::Arena<'a>>, &'a rustc_data_structures::sync::worker_local::WorkerLocal<rustc_hir::Arena<'a>>, rustc_driver_impl::run_compiler::{closure#0}::{closure#2}), Output = core::option::Option<rustc_interface::queries::Linker>>> as core::ops::function::FnOnce<(&rustc_session::session::Session, rustc_middle::ty::context::CurrentGcx, alloc::sync::Arc<rustc_data_structures::jobserver::Proxy>, &std::sync::once_lock::OnceLock<rustc_middle::ty::context::GlobalCtxt>, &rustc_data_structures::sync::worker_local::WorkerLocal<rustc_middle::arena::Arena>, &rustc_data_structures::sync::worker_local::WorkerLocal<rustc_hir::Arena>, rustc_driver_impl::run_compiler::{closure#0}::{closure#2})>>::call_once
   9: rustc_interface::passes::create_and_enter_global_ctxt::<core::option::Option<rustc_interface::queries::Linker>, rustc_driver_impl::run_compiler::{closure#0}::{closure#2}>
  10: <scoped_tls::ScopedKey<rustc_span::SessionGlobals>>::set::<rustc_interface::util::run_in_thread_with_globals<rustc_interface::util::run_in_thread_pool_with_globals<rustc_interface::interface::run_compiler<(), rustc_driver_impl::run_compiler::{closure#0}>::{closure#1}, ()>::{closure#0}, ()>::{closure#0}::{closure#0}::{closure#0}, ()>
  11: rustc_span::create_session_globals_then::<(), rustc_interface::util::run_in_thread_with_globals<rustc_interface::util::run_in_thread_pool_with_globals<rustc_interface::interface::run_compiler<(), rustc_driver_impl::run_compiler::{closure#0}>::{closure#1}, ()>::{closure#0}, ()>::{closure#0}::{closure#0}::{closure#0}>
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
------------------------------------------

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obk oli-obk oli-obk left review comments

Assignees

@scottmcm scottmcm

Labels

S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Function path is stripped of root for local crate

6 participants

@celinval @rustbot @rust-log-analyzer @oli-obk @makai410 @scottmcm